partial revert 5f6647b