Fix conflict in r66907 (follow-up r66793) accidentally partially reverting r66858