This reverts commit d82be8f5637960295f5190adb286f0c62d176e9b. Change-Id: I505373ce762314834991ac7329e8620a84ffe91f