Revert "Revert "2013-06-29 13:17""

This reverts commit bd9b5736a7132e75b305d24217d71e3a54a77877.