This reverts commit ad9f7238. Reason for revert: It was a temporary fix to get the build bots green. Change-Id: I9a99fb50145e7b68e52c558520c703853ff57d7f