Tests pass without this shim. Fixes 254.

Looks like we don't actually need this - so let's get rid of it.