content_shell is back, behind a flag