ugh. more derp

Change-Id: I777a94b578ac8f3bbba17d241fe05bb4ab4d52a5
put back some stuff

Change-Id: Idaa34988bb694ad27782f224749ba8b70c54a458