re-enable genvalid hack