Yet another revert error...

Change-Id: I6fb7c8456c917711221ee493e6e7c41c4d75ba2b