374aa5a81f
This reverts commit afe67917d1.
Reason for revert: no longer needed
Change-Id: I85e8928ef1def5583cfe6322bc522279bfeb62e1