This seems to undo part of #22