So I found the idle reset procedure Duvanator mentioned in another thread and tried it. I turned the key to on for 30 seconds, turned it off, and then started the engine and let it idle for 10+ minutes without touching anything.
After that it was good to go.
EDIT: Before I did that, though, I disconnected the battery again for several minutes to reset the ECU again.