Duh, I was reading the patch backwards. Revert erroneous previous patch, which reverted the erroneously erroneous previous previous patch.
Duh, I was reading the patch backwards. Revert erroneous previous patch,
which reverted the erroneously erroneous previous previous patch.

kaffe/kaffe,kaffe/kaffe,kaffe/kaffe,kaffe/kaffe,kaffe/kaffe