Revert "Switch to using .text() to pull stuff out of tags."

This reverts commit 30aa1edc12218c13bf198cae7bd04c22946048f9.
Merge for master