Remove NOOP checks. This breaks some things without any reason to do so,
rather have a liberal, more compatible implementation.
Patch from peter@dataloos.nl