Partially reverts e9663ef
(commented out), because fixes should be released before 0.8 compatibility is finally required.
Partially reverts e9663ef
(commented out), because fixes should be released before 0.8 compatibility is finally required.