Merge pull request #2834 from xmcclure/inflated_method_header_leak_followup