Revert "03/07/2014"

This reverts commit da30158d350aa0ef0feafcd0e093b7d1aff69d3a.