Revert to Jed's version; fixes