In the same vein of commits a5fb66d3 and d1f74955.

fly validate-pipeline (and set-pipeline) warns about it being
deprecated. This is also slightly in my way of backporting
868fd2d7 and 6aac45f3.