Bug 1014751: Remove workaround for naming. r=aki