Revert "Fix drag and drop (1/3)"

This reverts commit 59f532efad5562822fc36b44f37046abe1cb9e14.

Bug: 137819199
Test: manual
Change-Id: If5e8856aad74b6f232fff9d5fd746f56d63288eb
Merged-In: If5e8856aad74b6f232fff9d5fd746f56d63288eb
(cherry picked from commit c499ad377591bdca3956ae33e7ea10f6aa38b1b4)
3 files changed