WIP

Follow up to https://github.com/rails/rails/pull/15321#issuecomment-44309796