Revert "[4.0] Fix integration build error"