Refs #10246 Undoing last commit because of errors on other platforms