Partly revert last commit