Revert #22.

This causes tests to build every time and other bad effects.