This is a completely independent change right?  Is this already covered by another commit perhaps?