groupy branch: fix regression introduced in b8180792018ad4919c878434f2ab62f59fe24dcb
groupy branch: fix regression introduced in b8180792018ad4919c878434f2ab62f59fe24dcb

cgorringe/oscurrency,cgorringe/oscurrency,cgorringe/oscurrency,lazzarello/bk-tb-remote,lazzarello/bk-tb-remote