cc @jancborchardt We should maybe keep with em in OC6 and then clean up in OC7?