Rewrite following a new architecture plan could get finished pretty quickly, treating the original as a prototype.