Revert 96131dd..6fbc5b4

This rolls back to commit 96131dd6582624ce5f547e312001bcd016ed4f02.
14-11-2014 10:30