Test: this is a revert This reverts commit ea111fa8. Change-Id: I7581bd69e39ec0ab9a7775b7c347dd27eb652798