back out pretty much all of the line number changes to get back to where
we were before the action changes.