This reverts commit edbde49f3c. Jan is updating this to 4.2.2 soon so revert to unbreak autobuilds meanwhile.
edbde49f3c