Revert "merge main.js"

This reverts commit 2d47b5e93891db4bbfa4fe7599e2ad83f5e52981, reversing
changes made to 0be6bc9ae292bdd6449e0ba080259d231e7abc34.
main.js merge fixed