This is a regression from 2.x. 