Re-submit r191472 with a fix for big endian.