Revert "Intermediate commit to set JS changes"

This reverts commit 564ceff2b46f46c1d1be0468ca01b3a8164cef07.