Rollback of double click support
6 files changed