Revert "onClick fix"

This reverts commit 86229cdb8abd6ea76b0430a5e47e2f11096cd097.