Fix for UATNBFBL003 - 2nd Revert