Revert "18-3-2014_4 - commit"

This reverts commit 758c57f60cfb45f41fbe059e1c51307a6a2eb255.