Revert "Remove workarounds for CI and SI."