Revert "RM9305"
Merge pull request #224 from rackerlabs/revert-219-rm9305

Revert "RM9305"