MODE-2286 Minor change to make recent change more efficient
Merge pull request #1227 from rhauch/mode-2286

MODE-2286 Minor change to make recent change more efficient