Partially roll back r217324.