Revert 280e6a9..927898c

This rolls back to commit 280e6a923f34fcaf73fa3073dab6cef78373ccd8.
31-12-2014 15:19