There is a separate server bug, filed as #603