Refs #5291 Revert commit because it broke too many tests