Port 7441d3f4c55e9180dcc1f7700fe1c9710213f032 over to hosted docs