2ec4ceffbd
This reverts commit 3afea91088.
This was actually not the issue, even though it seemed to trigger the
issue.