Revert "Depend on base-compat"

This reverts commit 5a0f996ba67f69bcb4704c866b3781ccc796e679.