Put back UnsafeProvider to try to reproduce problem