Revert "Re-Go to MassStash land"

This reverts commit fdfaeba6bfe962fef60e3a70eb01ffe8a8f1a17d.