Revert 0c5b56e..03a5a75

This rolls back to commit 0c5b56e26b811ee6eabf21e94e29ed67eb0a796e.
9-10-2014 15:27