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

This reverts commit 962daec1ac8585c861db6d9b0287531595f6a121, reversing
changes made to 789b49e15f5349cba6f8060290feee0e1e698f36.