Backed out changeset 2514aac648b2 (bug 506975)