[#759] Reverted to old(er) version of Pipeline