This PR got messed up, this change isn't part of this PR. I'll fix it though.