Fix trac #2307: conflicting functional dependencies