Revert "31072014"

This reverts commit c28083f32411770576f7293d30b3ba04174e5fbc.