revert 00bd39fd8d3ceafec994e874f17773c2cd225b01
Merge pull request #12919 from gtmanfred/develop

revert 00bd39fd8d3ceafec994e874f17773c2cd225b01