This todo should be gone before merge as it is the purpose of the pull request.