This reverts commit 1bc41d4c. Reason for revert: Re-submitting after fixing tests. Test: See original change Change-Id: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262