Keep name around for logging / info item.
Merged bug25463 into default