- This is an optimization that was made in !581, and it needs to be
  backported to CE to avoid merge conflicts in the future.