Unbreak the scponly shell.

Manually merge f774dd980a48c9068e018d9685235e9607f19337

Ticket: #3287