More Taffy Edits
Revert "More Taffy Edits"

This reverts commit c4b4d45ac21c362342c76a96c34dadd395040ba2.