This should stabilize the build and allow us to properly branch a dev branch for testing the upgrade + version increment.