Revert "Merge branch 'ds991' into osi-dev-master"

This reverts commit c0c1a02ffd2e6344b93eb4908f1c6cbe29e32502, reversing
changes made to ed4c0f1bf5d938479fb81e5c21540e1bb596350e.