Switched to a non-fabric context manager