Remove references to the new rewrite, we don't need it in the bug fixes