Reverting BaseUtils for Macys branch