Ticket/master/pdb 954 fallback acceptance

we shouldn't need to include the params class here.