Partial revert of r203811 - this key is not needed.