Issue #2877030 by c.nish2k3, martin107, gaurav.kapoor, Mile23, dawehner: Remove stale deprecated code (cherry picked from commit 2defaa4e)