partial revert of benchmakr