Revert "Properly correct this build error"

Change-Id: I3c5029f7e17c5ddc5d1364da783949ce5747d117