Fix bug 907815 - Remove embed shell