Revert "Revert "Revert "INR Fix"""

This reverts commit b19acea82e79dbc7e4c901df638003222585f9ba.