Revert SWIG changes