Is this appropriate to commit upstream? Auto-mocking would take care of this in theory, but the details need some more work.