822cd3bf1b
This reverts commit cbd51ce6642be4e1163a64dce8ec20a454f1bf05. If you’ve started using this feature, I’m very sorry, but I think it’s better to revert it entirely, as it will only cause more problems in the future as more and more people upgrade and get bitten by this if we didn’t revert it… fixes #1536