Rails 4

@khanh can you clarify the motivation of this change?