Revert norm-style gen_set