TEMPORARY: Fixes for bringup with old sauce

Change-Id: Iba8b827d52506df933598ec831044f27cef0ab97
Revert "TEMPORARY: Fixes for bringup with old sauce"

This reverts commit bd38c6693ee4a6409350e11ec6e6f9c430b2ef72.