Revert, I have no idea how that commit made it here

Change-Id: I3f9259ecec3e20ba8851859e515145fbb9e00b58