Backed out changeset 5af4c6bd5104 (bug 827075) because it is no longer necessary