Merge "Revert "Change the list of recognized .rsh files""