Haribo Sour Mix FTW
Revert "Haribo Sour Mix FTW"

This reverts commit 5ceb667d851dcda47d71560da36d6992670440fe.
Fixing some local repo / merge craziness