Revert "Merge pull request #103 from jzblee/master"
Revert "Merge pull request #103 from jzblee/master"

This reverts commit b23a0fa32bb7b2dfe7c41e0a787e71ea82f18681, reversing
changes made to a772571f685dc54653cf8f5881fb0a2f1b2f855f.

This is being done so that Ben's corrected patch will apply.

rpitv/rpits,rpitv/rpits,rpitv/rpits