Revert "cherry-picked AI-693 fix"

This reverts commit 93e2c2f5dce7c3ac1eb4333f480e895d92151aa7.