Revert 27f92ce05.

The bug that worked around is fixed now.