grr actually this diff is in a different PR, let me kill it.. sigh.