Leaving this in for this commit. I'll deal with it in my next PR.