Merge "Fix the build: Revert "Anti-alias by default""