Fixed diff issue for real this time, seriously.
Revert aab3131..6e103b4

This rolls back to commit aab3131d15bbdc0fd604cdf267636bf4bbe18133.