Revert some workarounds for fixed issues.