Not related to this change, but should be removed.
(Removed from cleanup for #225, which I was working on when I hit this)