Revert the size_t modifications from HEAD that had led to more