Getting rid of rewrite for now