I wanted to make as few changes as possible to get tests passing (which coincidentally have failed because of a failing spec on the upstream rails4 branch). I can make this change on my branch if you'd like though.