Revert "Merge branch 'master' of https://github.com/ucb-bar/chisel"

This reverts commit 226efb483c3157f80604c93cbf95d664b4fea661, reversing
changes made to 85f837c9fe8927020c8ca1572ecf0b8470f9344c.