Revert "10-10-2014 17:55 fail"

This reverts commit 42fbec84cda8c00ad39d3003229774e0839381a8.