Fix: solve ticket:189. Revert previous solution revision r2782. Apply a more convenient proposal from commit r2896.