Comment 4 for bug 1685929

Just a head's up, the merge of the branch on bug 1695007 will cause a merge conflict here, due to the service moving. It should be a simple, mechanical resolution, though.