Fix tipsy bug, part 2

Change-Id: Ie3bf54c1f5e550b86bf29151ed14be36ad63bee0
Merge "Fix tipsy bug, part 2"