[PATCH 1/1] riched20: Remove duplicate code