Revert "Cleaning: remove RH5 specific code"

This reverts commit c0a7ee53f632ac302745b29afdcb32492323c1ed.