[[ Bug 14220 ]] Re-establish the pre-7.0 behaviour of server shell reading