Backout rdiscount upgrade

Fails to build under windows