Revert changes in core