https://bugzilla.gnome.org/show_bug.cgi?id=682158
Original commit message from CVS: building up speed