Revert "merge"

Reverts horato/LegendaryClient#2