For reviewers, see gh-1310 for when these lines were commented out to compare behavior