This reverts commit 48c30ef5. Reverting build-breaking change Change-Id: Iad6270e51cb1ead0efbd52c2dfcc6d2118931e4e