I would like to revert #1993 for now and make a minor release. objections