This reverts commit 960f4880.
This added code is exactly covered by the switch case 40 lines below (added in 74c4b3b8) (was already true at the time this commit was done), so it's not necessary to keep both code paths as one will be dead code.