This patch should remove any problems introduced by Nokia's patch (e.g. with concurrent shells)
please review the patch