This diff is BS, I barely changed anything and even the indentation (and tabs) are the same. Grr... github making me look bad...