Reverted change to make pipeline tables optional. More trouble than it was worth