How about actually removing the effect when it expires?

ow ow ow, this is probably the dumbest coding mistake I've ever made.
Fixes #8164