Move d2w code from up event to first down event
Revert "Move d2w code from up event to first down event"

This reverts commit 626c71b4f268bb625b61bbdc6ad8c48a6f6e673c.