Revert to 4f247d753a8865cd16292ff0b720b72c28049786

Change-Id: I8b1acac2df62ba98c6258d7c8e006911a6f986f7