Partially reverts I45ee3fd5b2131131f3d10e05a1cc2f32a3e091cc (I read the diff backwards) Change-Id: I5a638b8d13ed27a78586ff5507a421d7c49c9679