We shouldn't be committing commented out code, it's either relevant to this PR or it isn't.