This reverts commit a95cc77b. Causes an internal build failure. I followed up with the author by mail.