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