Revert "Don't build this stuff"

This reverts commit 2cb0341f7d89f67d838bf5fe1193956ef55b1164.