Fixes problem introduced in 8d0a7170f6, removes workaround from faf8358b3c This was SVN commit r4957.
8d0a7170f6
faf8358b3c