Revert "Merge branch 'maint'"