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