Revert 8e6be42..000057e

This rolls back to commit 8e6be422c4bfa09cf0ea9652e6b628271fd8a46b.
29-10-2014 11:36