Reverting b0db064d092e0903a0d35d3ab4cf948b4b3564db now we have a better way to test these attributes