We should be able to replace this with custom layouts and get rid of this JIT-EE method and the type definition in SPC.