This reverts commit 89d6c321. Reason for revert: Really fix all of the problems this time. Change-Id: I3e962494903660979e5803008102157cc356bc55