'Remove an added builtin and re-set the original.'

def remove_builtin(self, key, orig):

    if (orig is BuiltinUndefined):
        del builtin_mod.__dict__[key]
    else:
        builtin_mod.__dict__[key] = orig
