Revert a6eed25..7fe6d3b

This rolls back to commit a6eed2574aac3f780af7c2e73bbfab966f53296a.

Change-Id: I173f2df8a9753f9c8347df9d6c8c495121077b9f