Code review for commit b88b9cc39d81e4fc8a044f831d3c85fc99dabcae
Leave object in JavaScript file for now.