backing out 0dc6ae65566b2ccd42840aad6199c5c944cdcc34 in preparation for proper cleanup, refs #944, #953 and #945