Fix for UATNBFBL021 - 1st Revert

CFF Form