merged upstream but then got rid variant attrs