It seems like the fallout from this was not well sorted.
A lot of things aren't working, and there is still vestigial
v2 bits left behind.
This should have come with a much greater warning and some
spot checking of additional services working with this.
This reverts commit b162a1d58c.
Change-Id: Ia792b23119c00089542ba08879dca1c29dc80945
74b91c3eaf