JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Revert 2 commits to simplify merge.