IRMP: Change configuration back to previous values
Merge branch 'fix/irmp-config'