Revert "QuickBoot cleanup"

This reverts commit f17f927629406f8ef72c84faf406ebe4d20bb799.

Change-Id: I8e48361e332453f306c2bd100e1e279d4deb30ba