Don't set headers to None
fix poor merge