Revert "Fix for bug 45266. Needs parallel changes to OAI."

This reverts commit 24eb3e33ebe867c2a763a44405571ac556426a36

Change-Id: Id2582771cef5520e887551fb3f58424d11e4524c
Merge "Revert "Fix for bug 45266. Needs parallel changes to OAI.""