Revert 35dc8c3..547843e

This rolls back to commit 35dc8c3ec3e18425218b5ebf695351b82282b19d.
14-11-2014 11:28