This reverts commit 5d913f70.

Sorry, I don't understand how any of this works, and it seems pretty
opaque/difficult to fine-tune.