reverting second merge from post-commit-js-build