As discussed, not going to try for an upstream merge since they require ARC