No need to remain paranoid when the actual root case is dead
simple (see previous commit)

This reverts commit f5ce5516.

Ref: #2645