Temporarily reverting r5401, as the change was incomplete and caused problems like #5337. Thanks to Manuzhai for verifying this.
Temporarily reverting r5401, as the change was incomplete and caused problems like #5337. Thanks to Manuzhai for verifying this.

git-svn-id: 0d96b0c1a6983ccc08b3732614f4d6bfcf9cbb42@5466 af82e41b-90c4-0310-8c96-b1721e28e2e2

rbaumg/trac,rbaumg/trac,rbaumg/trac,rbaumg/trac