Reverted changes for 0.4.0 as well, this one doesn't compile for arm64 either.