Restore 989d361e88d08bd9e71bf7daafcb3b39af65bd3d to preserve a scenario that seems useful as suggested from @fitchner.