This reverts commit d3a817549b82c3f8c866296af4e952d1af5ac087. The reason for the revert is the problem reported in g3 which requires additional investigation. PR Close #37650