Backout of c78f3f687fbc. I'm sure it is fine, but @natefoo got in my head and I don't want to break anything.