This reverts commit ea1826ee. This change is breaking the ability of tests to override the profile output file. Need to add a mechanism to do that before resubmitting.