This reverts commit 298e183e. This commit caused some build failures -- reverting while I investigate.