We may have to punt on fixing these right now, but if we can't come up with a solution inside this PR we just need to make sure to track the problem elsewhere (either in a trello board or the github tracker). The automation really should be handling this. :(