Try barts current work, see if anything works now.

Change-Id: Ic4552488a79b2c2b11b63e2015a769c94cf1bbc8