Identical to previous version except without the KSAN workaround - Ard has a better solution for that.