Revert "Test to find out what's up with make btest"

This reverts commit a1e7f64f30ee325f5c2e48e8369f3a891caa22ba.