Revert "[3.0] temporary fix for build error"