Good catch! Welcome back and welcome to the “answer your own question” club!
I’ve got a bunch of those topics, though I’m sure many have been deleted.
The other thing would be to copy the app.yml, but you’d still have had to remember the swap. Except for the swap snag, the yml file is all you need if the S3 config is in the yml.
Glad you’re back up!