[bug 997080] Moar speed!