Remove some forgotten workarounds