bidi, the gift that keeps on giving

Change-Id: Ia33eb3e4c89963d7391df0339a2a5b948efd0d9f