You also have to trick the code git added to detect and block shattered-style attacks.
Still, eliminating the risk is a good idea.