Not using it in this commit, just wanted to
get the unmodified version in so it's easier to see the changes.