Revert to single build with unstable as default