Revert "[3.0] Fix common profile build error"