Revert workarounds (?) that aren't needed in 2.11.0-M7

Partially reverts e6437fdcc707