Revert "Merge pull request #13504 from jaoo/927486"

This reverts commit c624b65c1333d2f951533ff5f5d3094681cb1916.