Waiting until you need to rewrite it sounds like the perfect time to rewrite it.