Also remove that `// TODO` comment since it's not doing anything good for us.