Revert to pre-release, include minor changes