Revert "Don't carry the default_scope down to subcontent types."

This reverts commit 65dc06576c6fed749e764b32c767e02023e73fc8.