issue 3297 partial backout