am 67886218: Get drag and drop working again.

Merge commit '678862186af4ea70d9b4012c9bc127e7fea5e607'

* commit '678862186af4ea70d9b4012c9bc127e7fea5e607':
  Get drag and drop working again.