Don't depend on autobuild scripts
Don't overwrite unless existing entry is subheader

Should fix #3083