Reenabling rewrite