Revert changes from PR #1470

Per discussion in bug.
Merge pull request #1526 from jgmize/bug-939902-revert

Revert changes from PR #1470

Reverts bf1f56d61af50dcacb103b11883217558426a49f