Use columns parameter when replying with a single object, and test that.
Merge bug 25526.
stable to default