revert cf7848d0c9b4a8d830528b0d365ebbb40dba989d, refs #1269