Partially revert "Make more objects OM-Aware"

This reverts commits ffedc72eccdbcf7ec5bbb656a61086bf10996e01
and ffded2811255. Sadly I don't have the infrastructure to debug SMIME code.