BUG: Temporary backup

Revert the changed in #3323 and fix the glyph pipeline.
Fixes #3349
Fixes #3323