r819: Update bringup to where we were before

Change-Id: If4a721d7f7e3b779669e613918e0b93d72b71989