Fix unwanted revert

Change-Id: Ib2f136e2405452d0dc5d17e59552dce7f88c753a