Revert "Changes from Monday"
Merge pull request #2 from buddycloud/revert-1-master

Revert "Changes from Monday"