[Fixing botched merge] Dagnabbit, auto-merger! Trusted you the last time.