This reverts commit efa581e4. Reason for revert: Broke a test Change-Id: Ib5ab56032ba4c4203cbc6f3eaf1e5d80c89a9717