Revert "Merge branch 'master' of https://github.com/orisimo/TheVillage"

This reverts commit d7d80fba8010bee12b1168aac5b4204cbbc18982, reversing
changes made to c61fdb97edf648be3bdbf1052fa72bdee9f344ce.