Undo previous merge

Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900