revert trunk  bbop change