This reverts commit 8ad44855. Reason for revert: Breakage fixed, try again Change-Id: Ia648b9513d2224a5e363b65f44f9b2f838db1d3d