Revert 542bfc3..3d484e6

This rolls back to commit 542bfc39316e25a2fba1070c4eff543bf8ea0a99.
10-12-2014 11:46