This rebase here is a little confusing since this doesn't need to be done until being pushed to trunk.