The 'fix' for SteamPipe that I forgot to commit