Revert "[4.8.1] Backport a gimplify fix."

This reverts commit 73f8c537267b156708d35e90a1fab83332b779ef.