Revert 1857c77..a43608b

This rolls back to commit 1857c7725833b2570c02433d7f73a707db7368ac.
19-12-2014 11:16