remove issue #3148 workarounds (no longer needed)