Reverted some stuff in server.js and build.js