Restore Composer changes from yesterday, add new bundle to build script