Make it work with the new push-based pipe