Manually reverted 3823420 because it was breaking extraction