Revert "weird trick that makes test-packages run again"

This reverts commit 6b3a1c217b6397803da8c84e73d3693a7048320f.