This reverts commit 06a32206. Reverting build-breaking change Change-Id: Ib3698bca8f905033a9c7f22bc2fa9f7e7bf75873