This reverts commit f21fc8cc, which does not really corrects the problem observed by bob/bob.admin#107 (closed).