regression from...

commit b894104a
Date:   Thu Dec 8 00:43:09 2016 +0200

    Pass GlyphItem around

    We have this nice structure that contains (almost) all the information
    we need, so pass it around instead of passing separate fragments of said
    information.

presumably this is the correct fix given the context of the other changes

Change-Id: I8518e739b1caa00ea5ae1569282e98810462d4c3