Rebuilt rewrite.