This reverts commit ebe01ce20b. Looks like this commit undos the fix for #453, see also PRs #649 and #884. This also adds a comment so hopefully it doesn't get removed again in the future (or a proper fix is found).
ebe01ce20b