This reverts commit c8f1df99. This breaks master. Change-Id: Ic07f602af8732e2835bd11f65e3b9e766d3349c7