Reverted loading code to use new [Embed] support