The four line changes in this block should be reverted as what it was on master.