less intrusive handling of raf shim