Merge "Revert "Fix drag and drop (2/3)""