This line is what keeps me from merging in the changes myself (it doesn't seem to break despite obviously not being right) and where i'd need some input from @totycro or @nihathrael