Rolled back some minor changes.