UCBG-302: Fix rare flag not getting set to false if it's currently empty.