now that freezes seems to be fixed, no longer need these workarounds