Revert performance regression