Revert "Merge pull request #1158 from otoolep/bringup"

This reverts commit 081be7a0bcd8eeb07b489877c1b098543ae01a55, reversing
changes made to b60e6ecca9275b5a675a7023487b5bdb00350b0a.