Restore lost bits of 4dffb7255d56ff2fd57d3b60f95bc3657294fedd