Revert "Fix for last commit"

This reverts commit f52fc852cb1f98b84af95b52c9907a3bf71e006e.
Revert "Apply double-jeopardy to last round each drinker took part in"

This reverts commit 23846c41426e84c769416a0fff04eb7ab8e67d8e.