Depends on the outcome of #617
Depends on the outcome of #617