Merge "Using the rs API instead."