changed all intr_yield_on_return to thread_yield