Revert "18-3-2014"

This reverts commit d67640fd336d44645468281c29887adc99388587.