r47218 was missing needed changes which were accidentally ommitted from the patch. This should fix #20878 Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 47552