This reverts commit 9bf1ba5f8822682969cc1fb57248a81fcee57e96. I still think the behaviour I observed was related to something else.