Issue #2195075 by chertzog & ergonlogic: Fix D7 DBTNG changes.