Revert de8dca5..5ffde0d

This rolls back to commit de8dca53192052e1231af99ba1af3318565cc0e1.
21.08.2014

Finished revert