Revert "Merge branch 'jc/maint-add-ignored-dir' into next"