HIPPOTHEME-15: Remove fixes that were exclusively for the clickable. They might not be in 7.10