This functionality has been restored since its loss in 2.1