For my projects we end up embedding the fonts with base64. Much more manageable https://amio.github.io/embedded-google-fonts/