This reverts commit bd75b17a23. It would be fine to leave the commit as-is, but I'm reverting to make clear (and as a backup test) that the internal bug is fixed.
bd75b17a23