Partially revert previous commit: it is really hard thing to do