we're still listening to the old one here when we set a new one

Change-Id: Iaf64ba17a7adf2489a4f0475bba03a2500a556c0