Remove special branch

Change-Id: I797819b81b181408d924ef7c4160904ba3c391ac