Revert some new libs for compatibility