Follow up to https://github.com/rails/rails/pull/17646.