There's a lot of commented-out code in this PR. Please check if it really should be there.