Revert "4th September 2014"

This reverts commit 53b3228378e648806f8254115993a4b27161fd1d.