* Remove all non bfn specific changes from upstream PR
This reverts commit a7fddb83ca.
a7fddb83ca
* Update bf-master with azure/master * Undo changes to some files