Revert back to using size_t