I think this is inside LEGACY_EXEC - so shouldn't be changed.