Fix bad merge in 92ba5052a21519af59c2aa904e1e28d9081179fb