Revert the whitespace commits from previous