[RDY] Re-remove auto-opt-in; fix whitespace

Somehow, the auto-opt-in got re-added after the payments merge.