Revert "OSE-ify things to compile"

This reverts commit da815031a04743e57fce872e517b216568cd4f1e.

Change-Id: Idf5f789af6c83f99139afc897cb74bbf8a177568