backout parts of the interface from another development branch