Adopt upstream behavior