Merge "Remove setting that disabled mesa"