Revert "Fix up build"

This reverts commit 04ed962d48e6693e60ece9bb5286d4afc1cf524e.