Backing out "fix". No useful changes.

This reverts commit 4b9ad8f1679c1b80c9ccdf070dc8768cc9cdf32b.