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