This reverts commit 24a9683ac9. Change-Id: I6f305aac6ac8d5c550a39eb5c88ec2881203cecc Reason: Breaks a clean build on master.
24a9683ac9