This reverts commit f0bcb1da. Reason for revert: breaks a lot of builds Change-Id: I6ee4358adacd1425b259cf664ed600241da53aa1