This PR is rendered useless because @mwillbanks already fixed all of this in a different PR. But would you mind telling me why?