Bad merge of v1.7.1 code
Use .data() instead of .attr('data-')