revert significant speed regression from last commit