Re-add AT_FinaliseUtility stuff with fix.