Revert changes from PR #1470

Per discussion in bug.