Change hack to mirror my pull request to Rails