Final commit pre-rewrite.