maint.mk: revert most of the previous change re "all these"