Also should add a `@since TODO` as a reminder for the merger.