[[ Bug 13658 ]] Reset the shell behaviour to what is was in LC-6.x