xavierb pushed to sympa (f33). "Remove conditionals for F31"