Revert "Merge branch 'Defect_15404_ClickHereNoFuction'"

This reverts commit 2d47d1f460fe36959f7d0120a0a9ff94e560c615, reversing
changes made to bb6a77851c2d020308f98af3a9cab6265abe547f.