Redid #870 for MC 1.7