Revert "Bug 5504 - Controller crashes with OOM. oldRoot/currentRoot, toString()"