Revert "Merge branch 'ari-3985' into ait-qa"

This reverts commit 176e058d6be0eff76b0766ac4d4a780f25ecfe7c, reversing
changes made to e8b476ba233a1d2f16f7a9405da4a86c8acb388c.