Revert "Partial fix for errant tooltips - fixes all cases except nemo views"

This reverts commit 4d3dbef8b9daec28ee24623258fbc196fadbd9fd.