Comment out js hacks for test purpose