Temporary workaround for addressing #7359

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>