Moved WITH_FS logic into default.bootstrap.mk