Removed the code that was never being executed
Merge pull request #4930 from jrbasso/2.6-not-executed

Removed the code that was never being executed