Utils: ROLLING-BACK WITH PROBLEMATIC REFACTORING