SVN-Revision: 10494
This needs a different fix, but use this workaround for now. SVN-Revision: 10491
SVN-Revision: 10489