Revert part of change per Patrick's code review comment.