Fix branch super-derps

Change-Id: I04e09a03f3c36ef9a042c3e9b374c1dd755e227e