Reverted some bad changes.