If there won't be a second review in a few days, I will
commit this. I can't properly run tests without this patch.