reverting remnant of aborted rewrite