The functionality here is now largely implemented by paunch. Change-Id: Iae50555c76cdf4d4b6d8e46ea27b4df56e10d84f