The second patch obsolete the one provided in bug#57866.

Matthias