Revert b20cee1 but preserve client-side packet compatibility with 3.0.2.x servers.