Revert "2014-06-21 22:24"

This reverts commit d15a576ba17d845544ee6f7bfc8bc7484cfb5972.
Revert "Revert "2014-06-21 22:24""

This reverts commit b9a623bcbf1bc1d8d72280999ab579df7aebbd3f.