Revert "QuickBoot cleanup"

This reverts commit 1edad8b102dedff27a29102f6c4de069e483625a.

Change-Id: Ia626cd7890548ef33b89447def0a43617742253f