Revert "watch #88"

This reverts commit 001ea9a5fdfcf6519149cadbba222a170252e486.
#80 drag & drop broken in surface