Commented out conflicting rewrites for now