Remove PULL93 versioned-out code
Merge pull request #3041 from yebblies/PULL93

[cleanup] Remove PULL93 versioned-out code