Fixed to pass tests.

See Also: https://github.com/rails/rails/issues/4971