Fix from revert

Change-Id: I0b212223d0f8ba5b7277b806fd1748bb94f4f015