Stop using clean_headers (at least for now)