issue #22155: Comment out code until further along.
Merge pull request #1139 from jrogelstad/22155

issue #22155: Comment out code until further along.