Merge "Revert "Change the default docs build to use module stubs""