This reverts commit 5fe65c0c.

Unfortunately this causes a regression elsewhere.

This also disables the unit test for this bug - will re-enable when I find
a fix that both fixes this, and does not regress other stuff :-)

Change-Id: Iad334e3c59c928edb78f25c0f36a33a26a7e6125