This reverts commit 56430ad800. It builds on my machine, but apparently the buildbots choke on it...
56430ad800