Fix another merge conflict. (Add Waila register back in.)