Revert "Update for 1.7 spigot hack"

This reverts commit 962bbece37e6681785dec56cc2ca4c09ba3237dc.
Revert "Update entity status packet to use 1 instead of 2"

This reverts commit 22f2ae593b8af5d7f8b42a7e53940742c9c06b21.