Followup r86228 (profiling cleanup):