Fix for removing unwanted tool tip for now

Reviewer: Cy Casada

Issue:     GCP-9605