Revert "IRR-1 f5"

This reverts commit 111837d3a0fd5a226db9842091c06db8a9373b7a.