Merge "Revert "Use the runtime's implementation for park/unpark""