This reverts commit 34bde183. Change-Id: I51dfe1ef662fb3bbdea1b30b0d4bed8aa59c3fcd
mentioned in commit cee96110