Stems from #605.
Stems from #605.