I suspect that this refactor has something to do with #461