LP#1669868: fix regression that broke building staff client