untagged-e512efe562cd345f443f: Do it right damn it! (Proper clientside checking)

Thanks RandomLabs for actually providing something that won't cause incompatibilities (Still don't know how it managed that the first time)