Revert 1.7.10, it didn't work