Rolled back attempted fix of error in CI env.