Revert "avoid using shims"

This reverts commit c34b74141f982b5bf09cb308d58819678c8f3c71.