Rolled back some aggressive changes.