web commit by http://ethan.betacantrips.com/: hmm, applies cleanly?