backed out merge of branch 'js-file-version-timestamp'