Revert "Revert "Revert "Merge pull request #84 from GoogleChrome/big-bang"""

This reverts commit f18f6fd874b6477e45badf2249070e2a72bdc569.