revert 4f08587a740ae4 because unique key makes many tests fixtures sad (bug 1007544)