[z1869] Totem/Relic swapping should not trigger GCD

This reverts [s1298]

Thanks to Nighoo and faramir118 for info

(cleaned version of 5464bb4)

(based on commit [s1434] - 6e2c351)