fb6ef38370
This reverts commit af251caf, because it breaks daemon/client
compatibility, which we'd like to keep as much as possible