Fix bad merge from 3-0