Redmine/6119

This looks way too much like the wrong fix for the wrong problem.  See comments on the RedMine ticket.