Please revert 7212e37cbdf9 from 4.4-stable