Revert "Merge"

Reverts M10360/MCServer#2