See https://github.com/rails/rails/issues/29067#issuecomment-301342084
for rationale.

This reverts commit b76f82d7.

Fixes #29067. Fixes #29081.