Broken out of https://github.com/pattern-lab/patternlab-node/issues/815 Should fix https://github.com/pattern-lab/patternlab-node/issues/805 too