Revert "Reverting to Rdiscount."

This reverts commit c2d55f7b5a99005f19c8b32497f52cccbd1d1145.