Revert of I058fac389323b7f34134bc264c2c2cf5aa9feb6d

This is just in case we need to revert

Change-Id: I90ff8cc97b1cb7df1fb948da1114256f0071c044