Revert 2eeb68e..db71173

This rolls back to commit 2eeb68e3d61cb9cb11aca541635b01e2d268a7c6.
22-10-2014 16:07