Revert fix for #9231

This is more complicated than I thought.