Remove bogus entries from r60902 which was a problem from merging. There might be some extra

stuff left in here, but it should be close to accurate now.  Checked in with permission from Barry.