This change won't be necessary when this [comment](#r8507418) is implemented.