This reverts commit e86433b1.

This commit has been not tested, and it was impossible to repair it quickly in
a060bed1