Revert "sinking ship"

sinking is not ok. this shouldn't have been merged into development.
Reverts ivanbrennan/reversion#3