backing out f201b6f31b69288c004b4dca72c218afa75152d2 in preparation for proper cleanup, refs #862, #871 and #863