Adapt to post-#3085 changes in pipe_base, removing ugly workaround.