It's good this is extracted out as we need this in #123.