Revert "Merge pull request #31025 from y-yagi/follow_up_31023_part2"
Revert "Merge pull request #31025 from y-yagi/follow_up_31023_part2"

This reverts commit 6f481e05bb24fe3589ef0f65e97a9b1fa66ae0f7, reversing
changes made to 592f790b7693c0a32cd06d5e8201639923a734c5.

In favor of #31039.

vipulnsward/rails,illacceptanything/illacceptanything,yawboakye/rails,mechanicles/rails,schuetzm/rails,brchristian/rails,illacceptanything/illacceptanything,rafaelfranca/omg-rails,starknx/rails,gfvcastro/rails,illacceptanything/illacceptanything,Envek/rails,illacceptanything/illacceptanything,assain/rails,utilum/rails,aditya-kapoor/rails,tgxworld/rails,eileencodes/rails,aditya-kapoor/rails,BlakeWilliams/rails,schuetzm/rails,untidy-hair/rails,repinel/rails,notapatch/rails,bogdanvlviv/rails,kmcphillips/rails,arunagw/rails,BlakeWilliams/rails,illacceptanything/illacceptanything,iainbeeston/rails,baerjam/rails,illacceptanything/illacceptanything,jeremy/rails,Erol/rails,deraru/rails,printercu/rails,yalab/rails,lcreid/rails,palkan/rails,Stellenticket/rails,Edouard-chin/rails,Vasfed/rails,fabianoleittes/rails,brchristian/rails,arunagw/rails,georgeclaghorn/rails,assain/rails,Envek/rails,yawboakye/rails,shioyama/rails,kmcphillips/rails,schuetzm/rails,betesh/rails,Edouard-chin/rails,BlakeWilliams/rails,joonyou/rails,flanger001/rails,yahonda/rails,lcreid/rails,notapatch/rails,rails/rails,repinel/rails,illacceptanything/illacceptanything,mechanicles/rails,deraru/rails,travisofthenorth/rails,tgxworld/rails,pvalena/rails,repinel/rails,georgeclaghorn/rails,kddeisz/rails,untidy-hair/rails,jeremy/rails,Stellenticket/rails,betesh/rails,esparta/rails,rafaelfranca/omg-rails,odedniv/rails,yasslab/railsguides.jp,Edouard-chin/rails,yahonda/rails,gauravtiwari/rails,gfvcastro/rails,EmmaB/rails-1,joonyou/rails,utilum/rails,joonyou/rails,rails/rails,eileencodes/rails,yasslab/railsguides.jp,rafaelfranca/omg-rails,repinel/rails,gauravtiwari/rails,vipulnsward/rails,schuetzm/rails,illacceptanything/illacceptanything,BlakeWilliams/rails,notapatch/rails,yalab/rails,fabianoleittes/rails,Envek/rails,illacceptanything/illacceptanything,EmmaB/rails-1,eileencodes/rails,gfvcastro/rails,georgeclaghorn/rails,flanger001/rails,kddeisz/rails,travisofthenorth/rails,illacceptanything/illacceptanything,tjschuck/rails,shioyama/rails,shioyama/rails,yhirano55/rails,yhirano55/rails,assain/rails,yahonda/rails,illacceptanything/illacceptanything,MSP-Greg/rails,Erol/rails,esparta/rails,baerjam/rails,deraru/rails,MSP-Greg/rails,untidy-hair/rails,yhirano55/rails,aditya-kapoor/rails,Erol/rails,baerjam/rails,fabianoleittes/rails,odedniv/rails,yasslab/railsguides.jp,illacceptanything/illacceptanything,Erol/rails,rails/rails,iainbeeston/rails,pvalena/rails,prathamesh-sonpatki/rails,Vasfed/rails,pvalena/rails,brchristian/rails,aditya-kapoor/rails,mohitnatoo/rails,jeremy/rails,kmcphillips/rails,fabianoleittes/rails,flanger001/rails,Vasfed/rails,yalab/rails,printercu/rails,utilum/rails,notapatch/rails,bogdanvlviv/rails,flanger001/rails,travisofthenorth/rails,iainbeeston/rails,arunagw/rails,Stellenticket/rails,MSP-Greg/rails,starknx/rails,kddeisz/rails,illacceptanything/illacceptanything,eileencodes/rails,MSP-Greg/rails,baerjam/rails,utilum/rails,Stellenticket/rails,rails/rails,vipulnsward/rails,printercu/rails,mechanicles/rails,bogdanvlviv/rails,Envek/rails,palkan/rails,iainbeeston/rails,shioyama/rails,yhirano55/rails,odedniv/rails,mohitnatoo/rails,arunagw/rails,kddeisz/rails,Edouard-chin/rails,kmcphillips/rails,esparta/rails,deraru/rails,yahonda/rails,lcreid/rails,Vasfed/rails,palkan/rails,betesh/rails,EmmaB/rails-1,prathamesh-sonpatki/rails,mohitnatoo/rails,mohitnatoo/rails,yasslab/railsguides.jp,yawboakye/rails,mechanicles/rails,tjschuck/rails,tgxworld/rails,assain/rails,tjschuck/rails,vipulnsward/rails,joonyou/rails,prathamesh-sonpatki/rails,gfvcastro/rails,illacceptanything/illacceptanything,printercu/rails,lcreid/rails,esparta/rails,starknx/rails,bogdanvlviv/rails,yalab/rails,untidy-hair/rails,yawboakye/rails,georgeclaghorn/rails,tjschuck/rails,illacceptanything/illacceptanything,travisofthenorth/rails,tgxworld/rails,prathamesh-sonpatki/rails,palkan/rails,betesh/rails,pvalena/rails,jeremy/rails,gauravtiwari/rails