Revert "Local shim does not work any more?"

This reverts commit c79039e4598dc858e84baab87ef713cbab2fa3e8.