Remove some workarounds which are no-longer needed.