more common server arguments
throw away the compatibilty shim

LET THERE BE GLORIOUS BREAKAGE!