Revert "The winter update, part 2"
Merge pull request #2232 from d3athrow/revert-2173-winter2

Revert "The winter update, part 2"