Revert "[3.0] Fix ivi build error"