Remove disabled code.
Merge pull request #2334 from andreabedini/patch-4

Remove disabled code.