@wkempf, that's a sign of poor architectural choices resulting in fixing an embarrassing bug as this hard to do.