Landed a proper fix for #3255 - which involves doing createElement instead of going...