Merge "Revert introducing global-jjb for BBS-ep"