Revert "Change dragging logic."

This reverts commit b3fe5d4bbf1437d0beb43152e625aa42b629936b.
Revert "Revert "Change dragging logic.""

This reverts commit 28fb46c7e969c1aaaa97ee085608ee05fab71ead.