MASTER COMMIT Font hack re-added.