stop shaving with a machete (bug 934438)