BUG-731: move to new APIs

This fixes "Overriding method merely calls super".

Change-Id: I02794a2c2a118cafa847138ad22199a18df4a83c
Signed-off-by: Robert Varga <rovarga@cisco.com>