This actually depends on #634.