@jreback is this supposed to return `None`?