Sierra driver sync.

Another attempt at getting Github to recognize that the Sierra driver really is identical in both repositories.