This reverts commit c98605d3. Note: This work-around is still needed for 4.8 BUG: 312439 FIXED-IN: 2.7