Revert "Merge pull request #14160 from mpizza/Bug_941567"

This reverts commit 4f64f6b26f2d068126bb3cf0ff1b8404a71bbcf2, reversing
changes made to 256c2ac4a5e587d6d2afa0c51dcb70d6d11705bb.

find regression in this patch, backout first.