a2dc222
Revert "Note when #1933118 workaround can be removed" This reverts commit 01c2962f414fdeb15adbe49984ece5b67d116faa. We're removing the workaround now.