CS-5455 - JS being loaded twice