Created by: LawnGnome
This PR reverts #827, and must be merged before 4.0.0 stable is released.
At the same time this is merged, we should ensure the changelog reflects any releases made on 3.43.
3.43
If #827 works, this will also work.