Make build green again

This reverts commit 0c2ff8d982d4e6169c978cc75a554364eed03435, which
which broke the build.