Revert "Condense name/value attributes into a single key/value pair"

This reverts commit bead1d089be61eee0540c68a6360e681f65733ef.