revert commit acc6b65fb5

Change-Id: I2931cc8303ae5117727c4da02e880407f947c0ea