Previous revert was not very right - revert too much by 1 commit.