Remove some forced workarounds