Re-remove auto-opt-in; fix whitespace