Revert "Merge branch 'master' of https://github.com/lizzb/kaffeeklatsch"

This reverts commit 896bba069f9cde7590776b8f6e281b5ce8a9b272, reversing
changes made to 006de346300e6ddb4ba1db12a9b56427cfd389c7.