Since this was one of the more important missing pieces, maybe add a comment about why it's needed so that it doesn't go away in the future?