Reverted due to a link error on the buildbots. This reverts commit 297b6dea.
mentioned in commit 9b468388