Revert "Merge pull request #13542 from pivanov/bug-933206"

This reverts commit 5066947b583d0a6700b521c21c23f8f00b5c05ab, reversing
changes made to a32e81bf56a0326dfcadcacf176f48a682a0dce4.