Fixed. I've squashed it back to 1 commit now.