Revert db5a6460ad8583cdbe071d8501c1534ba8085f16

This breaks build

Change-Id: I16d805bf8ed5c2708b534734c8c6cb3717ee7823