Fixed #10497: Removed hack that switched around the values
Whitespace fixes