Switch to my own oppo-common