Revert "15-07-2013-12:21"

This reverts commit c192a15a9238b16b6d348ce52098e9880d45093e.