Just kidding, I don't want the exact changes from #990 in here.