Restored changes from r4351 that were overwritten in r4352

git-svn-id: http://svn.montala.net/svn/resourcespace@4386 c08608d7-6e46-0410-86ca-f2a6f1370df5