This reverts commit 97b3ae1a. Reverted since 4bb6b751 reverts the commit that warranted this change. Change-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f