Cleanup from our vendor/rails patches.