It had old, interfering logic of its own. Reviewed-by: Tobias Hunger (cherry picked from commit ed0394d4)