Fork vendor/cfx, it needs a makeover and some TLC