Revert rewrite