Improved fix for https://github.com/Polymer/HTMLImports/issues/75