Update code to upstream blocking start.