Partilly revert previous commit