Ticket/master/pdb 954 fallback acceptance

We should probably be throwing a deprecation warning here perhaps?