Revert some Sandcastle demos to more closely match master.