This reverts commit d94cccc523. Reason for revert: Patchset 2 was wrong, doesn't actually fix the bug Change-Id: Ie2d931ad3e2277ce1923284b13f50f62ac2f8917
d94cccc523