Don't only auto-create when the block name is a hard coded string.
Fix duplicate import that was supposed to provide backwards compatibility.