Revert "RM9305"

Reverts rackerlabs/quark#220