This is the setup you remember:



It's the rig I always use at the swaps. And I replaced that pump (after I killed it).