Revert a few changes