GIRAPH-101: Replace munge with shim layer