This fixes #8266.  All of the drivers can use the offset now.