the diff is a bit hard to parse out so not sure the logic didn't change in obscure ways. @esoergel did you review that closely? and/or do we think we need to do quick QA?