Revert "RM9305"
Merge pull request #223 from rackerlabs/revert-220-rm9305

Revert "RM9305"