Wtf? Fix some changes that I thought were already committed.