InterfaceBuilder refactoring commit again