Revert "21 June 2014"

This reverts commit 57d6c3a0d948f975063962ed3d75f0f86ed247d5.