Allows us to properly merge and branches and selectively remove modules from release. This reverts commit 846528aa.