Put a comment and an #if around the lines I changed in my previous commit, because...