refs #4007 in branch 1.X, an alternative fix for this issue has been committed. revert this one in order avoid merge confusion.