This can use your new API when it's in.