Added back some boilerplate code to make the pull request diff smaller.