Revert 6446126..6ae4922

This rolls back to commit 64461267d8aa90ab7e02ff8db037de28a1a053ac.
15-12-2014 18:03