Revert "Fixed: Handle attributes with "-" in their name"

This reverts commit 3a130f54ed798bfb392a298ee1e68f92014546c0.
Fixed: Handle attribute names with "-" in them.