Revert 1428f2dcb540e33c75ae98bd4da0ae43d2e22af2

Change-Id: Idee322612b201a7af766764ec923e5e4292ab324