Revert "23/06/2014-1"

This reverts commit 422f40f06433cfc0700bb1ee3ea47562c4aaa4c5.