Revert iso11 fixes for emoji factory

This reverts commit e24630f54c885f0cd4a58af70f1646082052eda9.