994558c335
Re-apply r343909 to this file to get the issue fixed. PR: 204956 Reported by: David Binderman <dcb314@hotmail.com> MFC after: 5 days