This reverts commit dc4e09a63a. Reason for revert: <INSERT REASONING HERE> Change-Id: Ie10442c9447f010bb90c679b6cffca5b48b8d054
dc4e09a63a