A few reverts that work

Change-Id: I04f89eafbc5e57f0f4ae261a1837d451f00d092a