Add NO_STAGE all over the place in preparation for the staging support