Fix bad merge of 5.9 into master
No idea how, but 19e83b28161783d570bde2ced692a8b5f2236693 got reverted when someone merged 5.9 into master.
This solves that through classic copy and paste.