Revert "Update global-jjb to master"