Reverted a few changes.