Revert "Merge branch 'JanRain/master'"

This reverts commit 7b00067c93786a1c747e04e4f6250408721b6c7b, reversing
changes made to 9ab93eb850d7c46fa1531a06f0fcd36ed0c1aea7.