Consolidate the dubs and fix for puphpet #762: https://github.com/puphpet/puphpet/issues/762