Fixed bug #17670: Remove deprecated functions scheduled for removal in 4.6