backing out ab5b3cba245d83929bafc315e1d230aac6c6e87e, incomplete, refs #901