dropping in 3.6.4