revert accidental part of the commit 6d9212640cc1ff3a54be9bafe10518a1dbd9d89c from 12.02.2013