Get us back to working state

Change-Id: Ib9aa1fc4fd6288c791041395779dd2be4431a1c9