Revert bee4ae5..9bfea9a

This rolls back to commit bee4ae55923d1dfa07de8f958e98ff986fac22c9.
21-10-2014 14:29