This reverts commit c741f1f83b DO NOT MERGE is ignored and this is merged anyway :( Change-Id: Ie044cdfc6021933379ec97ad7346c5c8591f70bf
c741f1f83b