This merge request is part of sysadmin#17734 and #17344 (yes! aliteration!)
This will create a new commit in order to revert the existing changes.