I reworked the way this was done so we can easily re-enable this as I think it's clearer when it's inactive (the difference between toggled and not toggled is pretty minor). With this abstraction we could reset the tooltip etc. too.