Revert "Merge branch 'horde_5_2' into imp_6_2"

This reverts commit 6be4899f38615d05cc40e2b42c3bb253b1aad3e9, reversing
changes made to 47dc9dd97f46c050f962bcdbfaa5ce446f3a0c79.
Remove old method.