Revert "I-rh01 to I-rh07 (see separate notes)"

This reverts commit a1b25b0027e9534a5e8463fadfe387a19f85a840.