Revert "Tweaked the embedding of the root view controller"

This reverts commit 5ca7dee38e769ed69c8cfb6569a007fdaba205f8.