If this is commented out, can we remove it from the PR?