@gavin, is this right?  I think we're missing some headers that could be of use.