Readd the workarround from the old version again which was removed in r22296 and refresh the patches. This should close #7874 Thank you Russell Senior for testing. SVN-Revision: 23911
SVN-Revision: 21707