Revert "Resolved conflicts between OS and OH."

This reverts commit 005cd62281edf21fcc2b99c7ff33c4f0cb00fbe5.