Basically a revert of Ie62fa4ed Maybe this is correct now? Change-Id: Ia2b1b5d35c2a209430a23110f1b929e2b1ac80fb