Remove feature of 3.6.x version only