This reverts commit a074ac79. Reason for revert: Broke several builds. Change-Id: I406f0b0aa0c37961ad031d2f6c5ea4241f3f1111