No idea how, but 19e83b28 got reverted when someone merged 5.9 into master. This solves that through classic copy and paste.
