Revert "Merge branch 'master' of https://github.com/nsendetzky/arcavias-core into 2014-04-30_stable-fixes"

This reverts commit 85d6135388599e345eedd6b25472a3d0b5bef148, reversing
changes made to ecce5e8f104a4f173a374ee4609c08ccd0cea342.