Rolled back attempt at PBFs.  Will use XML for now