rhqpi rollec back to 36055d42075523c commit