Merge "Revert "Modify -—with-extensions to throw extension dependency errors""