I'll move the above patch to patches.rb after merging.