Revert js2stopgap to its good state before r58959 tried to prettify it and r58997...