Reverted change for issue #5 with 'data-attribute-* not rendering correctly'