Merge "Remove unnecessary ASLR workaround"