revert 4110fb9bb23dee2bb365b817e535396855e28655, refs #1178