Please don't mix stuff different issue in the same pull request. And either this code is wrong and should be removed or it's right and should stay but commenting it is wrong for sure.