This reverts commit bd864577. Reason for revert: More breakages Change-Id: I9252b62444870d3d16a84254190cefb64e0a4bf3