SQUASH ME: reverted some pid_t changes in native