Final commit before rewrite.