Revert "#WIN-502 clicks"

This reverts commit 41b859f23eca79da5fd8fb91f0e3e8a9bb8de06a.
#WIN-502 fix