Revert "Merge pull request #13940 from gasolin/issue-929369"

This reverts commit 616f689484c17b8bd724873c52485dd5a4a29119, reversing
changes made to 6b4dd7baa58fbba70161d7979d8503f8fb9f64df.

Backout because This causes bug 942902