Close in favor of #68303