This reverts commit c0b8954e. The commit has broken various builds. Reverting while I investigate the cause.