more rewiring

Change-Id: I34e0fe062b5d151238ddaba52e5b7519384cbce1