This will cause troubles with the admin user panel. I'm sitting on a proper solution in #1363 - could you revert the changes in 22 - 25 please?