Revert "Merge pull request #25607 from mancas/bug1082936_v2.1"

This reverts commit 57401e89cf8dfb7cd6f6b589ed9a3a8974b05c9b, reversing
changes made to a27f0fbfb0e4aeedbf9a518e2409cecf2b7b5970.