Should not be commented out any more. Please rebase on master and revert this. (You should be able to force-push the branch to update this PR so you don't have to create a new one)