Fix bug with embedded
Revert comments now that bug is fixed