Last revert of the reverts

Change-Id: Ic0a0643b94d2451c62310cd6c815fb0bb4b1c761