Revert a few changes.