That was causing bugs after clicks.
Doesn't seem to be needed at all.
Merge branch 'hotfix/6.6.2'