Fix drag-n-drop broken in bc35e865