this was fixed and reverted somewhere

Change-Id: Ib7dc9b7a2c74223f5789f7cf34074471e28193e3
some stuff

Change-Id: If026a461fb0f5c09c680549e4aeb12dfe3252035