Reverted except for where it helped.