Revert #3760

This should be delayed until 2.11.2. Review by @retronym