Revert "local modifications to make this build on my machine"

This reverts commit cfd6f9373bc715fddca868eb018b52314aed08c7.