Almost revert previous commit