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