Readd formerly deleted RH specific changes