Revert "Revert "Revert "Support for multiple signature files in scope."""