Reverted a few things.