Revert "Merge remote-tracking branch 'origin/master' into 1.7.10"
Yeah that didn't work...

This reverts commit 714542e2c278e967feac1b9a2514aaa8693505a2, reversing
changes made to b579bcdcd8a8e4cd00b7a5ccdd04e7b3d097badd.