Created by: damccorm
Follow up to #2299. Would probably be good to have if we're deciding to keep Pipelines around.