Remove deprecated code from before release/3.5. See merge request !185 (cherry picked from commit b88c03af) 79eff692 Remove deprecated code from before release/3.5.