I think this file uses tabs.  Worth sending upstream?