Updates after revert to rdiscount