Revert "Issue #1796746 Revert patch #comment-6636400 for testing."

This reverts commit da39de897a4497cdcd11d07aad3578d71070059d.