Revert "Some another fixes..."

This reverts commit e31b9cb9d3de8d81e5c2372e80e99cb52e6dd7c3.