Revert "Fixing #1067: Undefined on hover"

This reverts commit 068c983001202ffcf112302ecc4c59112eac6031.