Reverted old_pid changes