removing some workarounds of bug that's now squashed