This reverts commit 248693fe. This is breaking oc-dev and everything downstream. Change-Id: I060a9778ad0013d59662899ba7a354ba81c9ee9a