Merge "Revert "Fix issue with proxy invocation on default methods""