Put back @elbertbautista's migration changes