Web.js restored from master