@rynderman Do you think you can replace this as part of this pull request?