Revert "Cleanup tooltips"
This reverts commit 20038f8a. I am reverting this change because it was applied without prior discussion on emacs-devel, and has been found to break the NS port. It needs more testing and review before it should be applied here.
Showing with 304 additions and 319 deletions