Reverted a bunch of changes.