Roll back interop exception improvement in order to make as separate pull request later