Merge "adbs was broken for a year and no-one noticed."