DO NOT MERGE: Revert "Fix build"

This reverts commit 005055c070a4e174a493fe585e467c0e711b96e9.

Change-Id: Ia71d1e95de48bc1d83a4924041953a2d42ed6a93
1 file changed