This got broken with the cursor commit. cc @josephfrazier, would be nice to add some end to end test here :)