Patch applied manually. Fixes bug #3245 and old interface names