Revert bc68afa..1c07762

This rolls back to commit bc68afac74158a0f08923b9c12d74e9a64cf9d65.
11-12-2014 11:36