The reasons behind commit 0d147e43 still
stand, so this reverts the non-cosmetic portion of commit
a7983e98.  Back-patch to 9.4, where the
latter commit first appeared.