Merge "Revert "Workaround libmemunreachable lockup""