Fix up bad merge into master. 

 Make sure we can merge develop later.