Revert "Re-ordered server opcodes and handlers to facilitate the export of client patch structs and handlers"