Revert back to before the changes related to Irf integration as I had not planned to commit that stuff in devel for now ...