Revert Click code cleanup (reverted from commit 439bda24bcfd970705c98f5e304f4613aa564156)
Readd overwritten change