This reverts commit ec7746fa80. Test: no test Merged-In: I9ec4493403d71419df99fe9761211eab057cdb0a Change-Id: I39f2acaa5ee376b90bcddd0891ac6f309cb40a2b
ec7746fa80