Revert wrapper code to handle special case
Revert wrapper code to handle special case

errordeveloper/fe-devel,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old,errordeveloper/fe-devel,errordeveloper/fe-devel,errordeveloper/fe-devel,errordeveloper/fe-devel,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old,errordeveloper/fe-devel,chbfiv/fabric-engine-old,errordeveloper/fe-devel,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old