Revert "INR Fix"

This reverts commit 2c4e4af61f5724a4198a523ccb83cabc2b244258.
Revert "Revert "INR Fix""

This reverts commit 85529442de22a1a42316186b37a4bc9527c14b3e.