029673d0ee
This reverts commit 3b85e4b2b911740d9f9dea672aa0e673b841e701. This breaks touch support; reverting would break wayland (is what this patch tried to fix; we should find a better solution that works on both).