Revert the cs part of r42225, following an IRC request by Danny B.